Merge branch 'upstream'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 26 May 2019 20:22:50 +0000 (22:22 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 26 May 2019 20:22:50 +0000 (22:22 +0200)

Trivial merge